Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(jest-config): merge preset globals with project globals #9027

Merged
merged 1 commit into from
Oct 26, 2019

Conversation

jdpearce
Copy link
Contributor

@jdpearce jdpearce commented Oct 8, 2019

Summary

Resolves #9026

Test plan

Unit test "preset with globals" added to packages/jest-config/src/__tests__/normalize.test.js

@facebook-github-bot
Copy link
Contributor

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need the corporate CLA signed.

If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks!

@facebook-github-bot
Copy link
Contributor

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@jdpearce jdpearce force-pushed the merge-preset-globals branch 2 times, most recently from cc46dd2 to b5473ae Compare October 8, 2019 19:58
@jdpearce
Copy link
Contributor Author

jdpearce commented Oct 8, 2019

I'm afraid I have no idea why test-node-12 is failing. That seems to have no relation to the code that I modified/added. 🤷

@thymikee
Copy link
Collaborator

thymikee commented Oct 8, 2019

It happens on other builds as well, don't worry about it for now

Copy link
Member

@SimenB SimenB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

project vs global is so confusing 🙁

@SimenB SimenB merged commit b096c16 into jestjs:master Oct 26, 2019
@jdpearce jdpearce deleted the merge-preset-globals branch October 28, 2019 10:11
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge preset globals with jest.config.js globals
4 participants